From cb8bc57fdfb70ff123ca0f0c726171dcb73c2382 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Mon, 18 Jan 2016 19:03:02 -0600 Subject: [PATCH] Starting with Qt 5.5, the default rpath handling changed. Add -Wl,-rpath bits to our ld invocation as suggested at http://lists.qt-project.org/pipermail/development/2015-September/023299.html --- configure | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b86235bc3..aaba6f59b 100755 --- a/configure +++ b/configure @@ -4825,7 +4825,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test $QT_FW_OR_LIBS = "**Unknown**" ; then QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS) fi - QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore" + QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore" QT_INC="$QT_FW_OR_LIBS" QT_INC_OPT="-F" QT_SYSINC_OPT="-iframework" diff --git a/configure.in b/configure.in index d8fd5d4e3..09059f4bd 100644 --- a/configure.in +++ b/configure.in @@ -224,7 +224,7 @@ case "$target" in if test $QT_FW_OR_LIBS = "**Unknown**" ; then QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS) fi - QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore" + QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore" QT_INC="$QT_FW_OR_LIBS" QT_INC_OPT="-F" QT_SYSINC_OPT="-iframework" -- 2.30.2